Change in openvpn[master]: console_systemd: rename query_user_exec to query_user_systemd
A message that is not in the archive (sent off-list or not yet received): gerrit.1718900482000.I379e1eb6dc57b9fe4bbdaefbd947a14326e7117a@...2715...
Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/670?usp=email
to review the following change.
Change subject: console_systemd: rename query_user_exec to query_user_systemd
......................................................................
console_systemd: rename query_user_exec to query_user_systemd
This allows us to override query_user_exec for unit tests more consistently without having to jump through weird hoops.
Fixes running test_pkcs11 with --enable-systemd.
While here also fix documentation comments for
query_user_exec*.
---
M src/openvpn/console.h
M src/openvpn/console_systemd.c
M tests/unit_tests/openvpn/test_pkcs11.c
M tests/unit_tests/openvpn/test_user_pass.c
4 files changed, 36 insertions(+), 13 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/70/670/1
src/openvpn/console.h +20 -8
@@ -65,11 +65,10 @@/** -* Executes a configured setup, using the built-in method for querying the user. +* Loop through configured query_user slots, using the built-in method for +* querying the user. * This method uses the console/TTY directly. * -* @param setup Pointer to the setup defining what to ask the user -* * @return True if executing all the defined steps completed successfully */ bool query_user_exec_builtin (void );
@@ -77,15 +76,28 @@#if defined(ENABLE_SYSTEMD )/** -* Executes a configured setup, using the compiled method for querying the user -* -* @param setup Pointer to the setup defining what to ask the user +* Loop through configured query_user slots, using the systemd method for +* querying the user. +* If systemd is not running it will fall back to use +* query_user_exec_builtin() instead. * * @return True if executing all the defined steps completed successfully */ -bool query_user_exec (void ); +bool query_user_exec_systemd (void ); -#else /* ENABLE_SYSTEMD not defined*/ +/** +* Loop through configured query_user slots, using the compiled method for +* querying the user. +* +* @return True if executing all the defined steps completed successfully +*/ +static bool +query_user_exec (void ) +{ +return query_user_exec_systemd (); +} + +#else /* ENABLE_SYSTEMD not defined */ /** * Wrapper function enabling query_user_exec() if no alternative methods have * been enabled
src/openvpn/console_systemd.c +1 -1
@@ -96,7 +96,7 @@* */ bool -query_user_exec (void ) +query_user_exec_systemd (void ) {bool ret = true;/* Presume everything goes okay */ int i;
tests/unit_tests/openvpn/test_pkcs11.c +8 -0
@@ -75,6 +75,14 @@ {assert_true (0 ); } +#if defined(ENABLE_SYSTEMD ) +bool +query_user_exec_systemd (void ) +{ +assert_true (0 ); +return false; +} +#endif bool query_user_exec_builtin (void ) {
tests/unit_tests/openvpn/test_user_pass.c +7 -4
@@ -26,10 +26,6 @@#include "config.h" #endif -#undef ENABLE_SYSTEMD -/* avoid redefining ENABLE_SYSTEMD in misc.c */ -#undef HAVE_CONFIG_H -#include "syshead.h" #include "manage.h"
@@ -44,6 +40,13 @@struct management *management;/* global */ /* mocking */ +#if defined(ENABLE_SYSTEMD ) +bool +query_user_exec_systemd (void ) +{ +return query_user_exec_builtin (); +} +#endif bool query_user_exec_builtin (void ) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/670?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I379e1eb6dc57b9fe4bbdaefbd947a14326e7117a
Gerrit-Change-Number: 670
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/670?usp=email )
Change subject: console_systemd: rename query_user_exec to query_user_systemd
......................................................................
Patch Set 3: Code-Review+1
(2 comments)
Patchset:
PS3:
I think this is a good change. I had one comment about the code-in-header and making them inline, though... what do you think?
File src/openvpn/console.h:
http://gerrit.openvpn.net/c/openvpn/+/670/comment/a68c3cbb_5ae4e68e :
PS3, Line 94: static bool
our normal convention seems to be "if there is code in .h files, it's tagged as inline". I can see that this is not true for the existing query_user_exec() wrapper, but maybe we want to fix this as well here?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/670?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I379e1eb6dc57b9fe4bbdaefbd947a14326e7117a
Gerrit-Change-Number: 670
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Thu, 25 Jul 2024 15:55:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: cron2, flichtenheld, plaisthos.
Hello cron2, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/670?usp=email
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Code-Review+1 by cron2
Change subject: console_systemd: rename query_user_exec to query_user_systemd
......................................................................
console_systemd: rename query_user_exec to query_user_systemd
This allows us to override query_user_exec for unit tests more consistently without having to jump through weird hoops.
Fixes running test_pkcs11 with --enable-systemd.
While here also fix documentation comments for
query_user_exec*.
---
M src/openvpn/console.h
M src/openvpn/console_systemd.c
M tests/unit_tests/openvpn/test_pkcs11.c
M tests/unit_tests/openvpn/test_user_pass.c
4 files changed, 37 insertions(+), 14 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/70/670/4
src/openvpn/console.h +21 -9
@@ -65,11 +65,10 @@/** -* Executes a configured setup, using the built-in method for querying the user. +* Loop through configured query_user slots, using the built-in method for +* querying the user. * This method uses the console/TTY directly. * -* @param setup Pointer to the setup defining what to ask the user -* * @return True if executing all the defined steps completed successfully */ bool query_user_exec_builtin (void );
@@ -77,21 +76,34 @@#if defined(ENABLE_SYSTEMD )/** -* Executes a configured setup, using the compiled method for querying the user -* -* @param setup Pointer to the setup defining what to ask the user +* Loop through configured query_user slots, using the systemd method for +* querying the user. +* If systemd is not running it will fall back to use +* query_user_exec_builtin() instead. * * @return True if executing all the defined steps completed successfully */ -bool query_user_exec (void ); +bool query_user_exec_systemd (void ); -#else /* ENABLE_SYSTEMD not defined*/ +/** +* Loop through configured query_user slots, using the compiled method for +* querying the user. +* +* @return True if executing all the defined steps completed successfully +*/ +static inline bool +query_user_exec (void ) +{ +return query_user_exec_systemd (); +} + +#else /* ENABLE_SYSTEMD not defined */ /** * Wrapper function enabling query_user_exec() if no alternative methods have * been enabled * */ -static bool +static inline bool query_user_exec (void ) {return query_user_exec_builtin ();
src/openvpn/console_systemd.c +1 -1
@@ -96,7 +96,7 @@* */ bool -query_user_exec (void ) +query_user_exec_systemd (void ) {bool ret = true;/* Presume everything goes okay */ int i;
tests/unit_tests/openvpn/test_pkcs11.c +8 -0
@@ -75,6 +75,14 @@ {assert_true (0 ); } +#if defined(ENABLE_SYSTEMD ) +bool +query_user_exec_systemd (void ) +{ +assert_true (0 ); +return false; +} +#endif bool query_user_exec_builtin (void ) {
tests/unit_tests/openvpn/test_user_pass.c +7 -4
@@ -26,10 +26,6 @@#include "config.h" #endif -#undef ENABLE_SYSTEMD -/* avoid redefining ENABLE_SYSTEMD in misc.c */ -#undef HAVE_CONFIG_H -#include "syshead.h" #include "manage.h"
@@ -44,6 +40,13 @@struct management *management;/* global */ /* mocking */ +#if defined(ENABLE_SYSTEMD ) +bool +query_user_exec_systemd (void ) +{ +return query_user_exec_builtin (); +} +#endif bool query_user_exec_builtin (void ) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/670?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I379e1eb6dc57b9fe4bbdaefbd947a14326e7117a
Gerrit-Change-Number: 670
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: cron2, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/670?usp=email )
Change subject: console_systemd: rename query_user_exec to query_user_systemd
......................................................................
Patch Set 3:
(1 comment)
File src/openvpn/console.h:
http://gerrit.openvpn.net/c/openvpn/+/670/comment/b0d2dbce_b9a19cd3 :
PS3, Line 94: static bool
Quoted 1 line
our normal convention seems to be "if there is code in .h files, it's tagged as inline". […]
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/670?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I379e1eb6dc57b9fe4bbdaefbd947a14326e7117a
Gerrit-Change-Number: 670
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Comment-Date: Fri, 26 Jul 2024 09:34:09 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: cron2 <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/670?usp=email )
Change subject: console_systemd: rename query_user_exec to query_user_systemd
......................................................................
Patch Set 4: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/670?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I379e1eb6dc57b9fe4bbdaefbd947a14326e7117a
Gerrit-Change-Number: 670
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Fri, 26 Jul 2024 10:40:05 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/670?usp=email )
Change subject: console_systemd: rename query_user_exec to query_user_systemd
......................................................................
Patch Set 4:
(1 comment)
Patchset:
PS4:
LGTM
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/670?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I379e1eb6dc57b9fe4bbdaefbd947a14326e7117a
Gerrit-Change-Number: 670
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Fri, 26 Jul 2024 10:40:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
PATCH v4 1/1 console_systemd: rename query_user_exec to query_user_systemd
In reply to a message not in the archiveFrom: Frank Lichtenheld <[email protected]...>
This allows us to override query_user_exec for unit tests more consistently without having to jump through weird hoops.
Fixes running test_pkcs11 with --enable-systemd.
While here also fix documentation comments for
query_user_exec*.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/670
This mail reflects revision 4 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/console.h +21 -9
@@ -65,11 +65,10 @@/** -* Executes a configured setup, using the built-in method for querying the user. +* Loop through configured query_user slots, using the built-in method for +* querying the user. * This method uses the console/TTY directly. * -* @param setup Pointer to the setup defining what to ask the user -* * @return True if executing all the defined steps completed successfully */ bool query_user_exec_builtin (void );
@@ -77,21 +76,34 @@#if defined(ENABLE_SYSTEMD )/** -* Executes a configured setup, using the compiled method for querying the user -* -* @param setup Pointer to the setup defining what to ask the user +* Loop through configured query_user slots, using the systemd method for +* querying the user. +* If systemd is not running it will fall back to use +* query_user_exec_builtin() instead. * * @return True if executing all the defined steps completed successfully */ -bool query_user_exec (void ); +bool query_user_exec_systemd (void ); -#else /* ENABLE_SYSTEMD not defined*/ +/** +* Loop through configured query_user slots, using the compiled method for +* querying the user. +* +* @return True if executing all the defined steps completed successfully +*/ +static inline bool +query_user_exec (void ) +{ +return query_user_exec_systemd (); +} + +#else /* ENABLE_SYSTEMD not defined */ /** * Wrapper function enabling query_user_exec() if no alternative methods have * been enabled * */ -static bool +static inline bool query_user_exec (void ) {return query_user_exec_builtin ();
src/openvpn/console_systemd.c +1 -1
@@ -96,7 +96,7 @@* */ bool -query_user_exec (void ) +query_user_exec_systemd (void ) {bool ret = true;/* Presume everything goes okay */ int i;
tests/unit_tests/openvpn/test_pkcs11.c +8 -0
@@ -75,6 +75,14 @@ {assert_true (0 ); } +#if defined(ENABLE_SYSTEMD ) +bool +query_user_exec_systemd (void ) +{ +assert_true (0 ); +return false; +} +#endif bool query_user_exec_builtin (void ) {
tests/unit_tests/openvpn/test_user_pass.c +7 -4
@@ -26,10 +26,6 @@#include "config.h" #endif -#undef ENABLE_SYSTEMD -/* avoid redefining ENABLE_SYSTEMD in misc.c */ -#undef HAVE_CONFIG_H -#include "syshead.h" #include "manage.h"
@@ -44,6 +40,13 @@struct management *management;/* global */ /* mocking */ +#if defined(ENABLE_SYSTEMD ) +bool +query_user_exec_systemd (void ) +{ +return query_user_exec_builtin (); +} +#endif bool query_user_exec_builtin (void ) {
[Openvpn-devel] [PATCH applied] Re: console_systemd: rename query_user_exec to query_user_systemd
Simplification of code, less #ifdef/#undef tricks, good :-) - stared at code, and compile tested (FreeBSD + GHA).
Your patch has been applied to the master branch.
commit 418463ad27c13f56adb5b02cfd62018b7d634ee8 (master)
Author: Frank Lichtenheld Date: Fri Jul 26 12:40:32 2024 +0200
console_systemd: rename query_user_exec to query_user_systemd
Signed-off-by: Frank Lichtenheld <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28983.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#5) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/670?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: console_systemd: rename query_user_exec to query_user_systemd
......................................................................
console_systemd: rename query_user_exec to query_user_systemd
This allows us to override query_user_exec for unit tests more consistently without having to jump through weird hoops.
Fixes running test_pkcs11 with --enable-systemd.
While here also fix documentation comments for
query_user_exec*.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28983.html
---
M src/openvpn/console.h
M src/openvpn/console_systemd.c
M tests/unit_tests/openvpn/test_pkcs11.c
M tests/unit_tests/openvpn/test_user_pass.c
4 files changed, 37 insertions(+), 14 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/70/670/5
src/openvpn/console.h +21 -9
@@ -65,11 +65,10 @@/** -* Executes a configured setup, using the built-in method for querying the user. +* Loop through configured query_user slots, using the built-in method for +* querying the user. * This method uses the console/TTY directly. * -* @param setup Pointer to the setup defining what to ask the user -* * @return True if executing all the defined steps completed successfully */ bool query_user_exec_builtin (void );
@@ -77,21 +76,34 @@#if defined(ENABLE_SYSTEMD )/** -* Executes a configured setup, using the compiled method for querying the user -* -* @param setup Pointer to the setup defining what to ask the user +* Loop through configured query_user slots, using the systemd method for +* querying the user. +* If systemd is not running it will fall back to use +* query_user_exec_builtin() instead. * * @return True if executing all the defined steps completed successfully */ -bool query_user_exec (void ); +bool query_user_exec_systemd (void ); -#else /* ENABLE_SYSTEMD not defined*/ +/** +* Loop through configured query_user slots, using the compiled method for +* querying the user. +* +* @return True if executing all the defined steps completed successfully +*/ +static inline bool +query_user_exec (void ) +{ +return query_user_exec_systemd (); +} + +#else /* ENABLE_SYSTEMD not defined */ /** * Wrapper function enabling query_user_exec() if no alternative methods have * been enabled * */ -static bool +static inline bool query_user_exec (void ) {return query_user_exec_builtin ();
src/openvpn/console_systemd.c +1 -1
@@ -96,7 +96,7 @@* */ bool -query_user_exec (void ) +query_user_exec_systemd (void ) {bool ret = true;/* Presume everything goes okay */ int i;
tests/unit_tests/openvpn/test_pkcs11.c +8 -0
@@ -75,6 +75,14 @@ {assert_true (0 ); } +#if defined(ENABLE_SYSTEMD ) +bool +query_user_exec_systemd (void ) +{ +assert_true (0 ); +return false; +} +#endif bool query_user_exec_builtin (void ) {
tests/unit_tests/openvpn/test_user_pass.c +7 -4
@@ -26,10 +26,6 @@#include "config.h" #endif -#undef ENABLE_SYSTEMD -/* avoid redefining ENABLE_SYSTEMD in misc.c */ -#undef HAVE_CONFIG_H -#include "syshead.h" #include "manage.h"
@@ -44,6 +40,13 @@struct management *management;/* global */ /* mocking */ +#if defined(ENABLE_SYSTEMD ) +bool +query_user_exec_systemd (void ) +{ +return query_user_exec_builtin (); +} +#endif bool query_user_exec_builtin (void ) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/670?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I379e1eb6dc57b9fe4bbdaefbd947a14326e7117a
Gerrit-Change-Number: 670
Gerrit-PatchSet: 5
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/670?usp=email )
Change subject: console_systemd: rename query_user_exec to query_user_systemd
......................................................................
console_systemd: rename query_user_exec to query_user_systemd
This allows us to override query_user_exec for unit tests more consistently without having to jump through weird hoops.
Fixes running test_pkcs11 with --enable-systemd.
While here also fix documentation comments for
query_user_exec*.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28983.html
---
M src/openvpn/console.h
M src/openvpn/console_systemd.c
M tests/unit_tests/openvpn/test_pkcs11.c
M tests/unit_tests/openvpn/test_user_pass.c
4 files changed, 37 insertions(+), 14 deletions(-)
src/openvpn/console.h +21 -9
@@ -65,11 +65,10 @@/** -* Executes a configured setup, using the built-in method for querying the user. +* Loop through configured query_user slots, using the built-in method for +* querying the user. * This method uses the console/TTY directly. * -* @param setup Pointer to the setup defining what to ask the user -* * @return True if executing all the defined steps completed successfully */ bool query_user_exec_builtin (void );
@@ -77,21 +76,34 @@#if defined(ENABLE_SYSTEMD )/** -* Executes a configured setup, using the compiled method for querying the user -* -* @param setup Pointer to the setup defining what to ask the user +* Loop through configured query_user slots, using the systemd method for +* querying the user. +* If systemd is not running it will fall back to use +* query_user_exec_builtin() instead. * * @return True if executing all the defined steps completed successfully */ -bool query_user_exec (void ); +bool query_user_exec_systemd (void ); -#else /* ENABLE_SYSTEMD not defined*/ +/** +* Loop through configured query_user slots, using the compiled method for +* querying the user. +* +* @return True if executing all the defined steps completed successfully +*/ +static inline bool +query_user_exec (void ) +{ +return query_user_exec_systemd (); +} + +#else /* ENABLE_SYSTEMD not defined */ /** * Wrapper function enabling query_user_exec() if no alternative methods have * been enabled * */ -static bool +static inline bool query_user_exec (void ) {return query_user_exec_builtin ();
src/openvpn/console_systemd.c +1 -1
@@ -96,7 +96,7 @@* */ bool -query_user_exec (void ) +query_user_exec_systemd (void ) {bool ret = true;/* Presume everything goes okay */ int i;
tests/unit_tests/openvpn/test_pkcs11.c +8 -0
@@ -75,6 +75,14 @@ {assert_true (0 ); } +#if defined(ENABLE_SYSTEMD ) +bool +query_user_exec_systemd (void ) +{ +assert_true (0 ); +return false; +} +#endif bool query_user_exec_builtin (void ) {
tests/unit_tests/openvpn/test_user_pass.c +7 -4
@@ -26,10 +26,6 @@#include "config.h" #endif -#undef ENABLE_SYSTEMD -/* avoid redefining ENABLE_SYSTEMD in misc.c */ -#undef HAVE_CONFIG_H -#include "syshead.h" #include "manage.h"
@@ -44,6 +40,13 @@struct management *management;/* global */ /* mocking */ +#if defined(ENABLE_SYSTEMD ) +bool +query_user_exec_systemd (void ) +{ +return query_user_exec_builtin (); +} +#endif bool query_user_exec_builtin (void ) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/670?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I379e1eb6dc57b9fe4bbdaefbd947a14326e7117a
Gerrit-Change-Number: 670
Gerrit-PatchSet: 5
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged